Tobacco and non-tobacco e-cigarettes